newRecentLanguages = new ArrayList<>(Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages));
newRecentLanguages.remove(language);
newRecentLanguages.add(0, language);
+ if (encoding != null) {
+ newRecentLanguages.remove(encoding);
+ newRecentLanguages.add(0, encoding);
+ }
+ if ("bottom".equals(encoding) && !GlobalUserPreferences.bottomEncoding) {
+ GlobalUserPreferences.bottomEncoding = true;
+ GlobalUserPreferences.save();
+ }
recentLanguages.put(accountID, newRecentLanguages.stream().limit(4).collect(Collectors.toList()));
GlobalUserPreferences.save();
}
@@ -1129,7 +1248,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
}
private void confirmDiscardDraftAndFinish(){
- new M3AlertDialogBuilder(getActivity())
+ boolean attachmentsPending = attachments.stream().anyMatch(att -> att.state != AttachmentUploadState.DONE);
+ if (attachmentsPending) new M3AlertDialogBuilder(getActivity())
+ .setTitle(R.string.sk_unfinished_attachments)
+ .setMessage(R.string.sk_unfinished_attachments_message)
+ .setPositiveButton(R.string.edit, (d, w) -> {})
+ .setNegativeButton(R.string.discard, (d, w) -> Nav.finish(this))
+ .show();
+ else new M3AlertDialogBuilder(getActivity())
.setTitle(editingStatus != null ? R.string.sk_confirm_save_changes : R.string.sk_confirm_save_draft)
.setPositiveButton(R.string.save, (d, w) -> {
updateScheduledAt(scheduledAt == null ? getDraftInstant() : scheduledAt);
@@ -1139,18 +1265,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
.show();
}
- /**
- * Check to see if Android platform photopicker is available on the device\
- * @return whether the device supports photopicker intents.
- */
- private boolean isPhotoPickerAvailable() {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
- return true;
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- return getExtensionVersion(Build.VERSION_CODES.R) >= 2;
- } else
- return false;
- }
/**
* Builds the correct intent for the device version to select media.
@@ -1160,26 +1274,26 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
*
* For earlier versions use the built in docs ui via {@link Intent#ACTION_GET_CONTENT}
*/
- private void openFilePicker(){
+ private void openFilePicker(boolean photoPicker){
Intent intent;
- boolean usePhotoPicker = isPhotoPickerAvailable();
- if (usePhotoPicker) {
- intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
- intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
- } else {
- intent = new Intent(Intent.ACTION_GET_CONTENT);
+ boolean usePhotoPicker=photoPicker && isPhotoPickerAvailable();
+ if(usePhotoPicker){
+ intent=new Intent(MediaStore.ACTION_PICK_IMAGES);
+ intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MAX_ATTACHMENTS-getMediaAttachmentsCount());
+ }else{
+ intent=new Intent(Intent.ACTION_GET_CONTENT);
intent.addCategory(Intent.CATEGORY_OPENABLE);
intent.setType("*/*");
}
- if (!usePhotoPicker && instance.configuration != null &&
- instance.configuration.mediaAttachments != null &&
- instance.configuration.mediaAttachments.supportedMimeTypes != null &&
- !instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()) {
+ if(!usePhotoPicker && instance.configuration!=null &&
+ instance.configuration.mediaAttachments!=null &&
+ instance.configuration.mediaAttachments.supportedMimeTypes!=null &&
+ !instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()){
intent.putExtra(Intent.EXTRA_MIME_TYPES,
instance.configuration.mediaAttachments.supportedMimeTypes.toArray(
new String[0]));
- } else {
- if (!usePhotoPicker) {
+ }else{
+ if(!usePhotoPicker){
// If photo picker is being used these are the default mimetypes.
intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
}
@@ -1524,6 +1638,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
DraftMediaAttachment att=(DraftMediaAttachment) v.getTag();
if(att.serverAttachment==null)
return;
+ editMediaDescription(att);
+ }
+
+ private void editMediaDescription(DraftMediaAttachment att) {
Bundle args=new Bundle();
args.putString("account", accountID);
args.putString("attachment", att.serverAttachment.id);
@@ -1600,18 +1718,20 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
menu.getMenu().add(0, 2, 0, getResources().getQuantityString(R.plurals.x_minutes, 30, 30));
menu.getMenu().add(0, 3, 0, getResources().getQuantityString(R.plurals.x_hours, 1, 1));
menu.getMenu().add(0, 4, 0, getResources().getQuantityString(R.plurals.x_hours, 6, 6));
- menu.getMenu().add(0, 5, 0, getResources().getQuantityString(R.plurals.x_days, 1, 1));
- menu.getMenu().add(0, 6, 0, getResources().getQuantityString(R.plurals.x_days, 3, 3));
- menu.getMenu().add(0, 7, 0, getResources().getQuantityString(R.plurals.x_days, 7, 7));
+ menu.getMenu().add(0, 5, 0, getResources().getQuantityString(R.plurals.x_hours, 12, 12));
+ menu.getMenu().add(0, 6, 0, getResources().getQuantityString(R.plurals.x_days, 1, 1));
+ menu.getMenu().add(0, 7, 0, getResources().getQuantityString(R.plurals.x_days, 3, 3));
+ menu.getMenu().add(0, 8, 0, getResources().getQuantityString(R.plurals.x_days, 7, 7));
menu.setOnMenuItemClickListener(item->{
pollDuration=switch(item.getItemId()){
case 1 -> 5*60;
case 2 -> 30*60;
case 3 -> 3600;
case 4 -> 6*3600;
- case 5 -> 24*3600;
- case 6 -> 3*24*3600;
- case 7 -> 7*24*3600;
+ case 5 -> 12*3600;
+ case 6 -> 24*3600;
+ case 7 -> 3*24*3600;
+ case 8 -> 7*24*3600;
default -> throw new IllegalStateException("Unexpected value: "+item.getItemId());
};
pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr=item.getTitle().toString()));
@@ -1705,12 +1825,33 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
return attachments.size();
}
+ private void updateHeaders() {
+ UiUtils.setExtraTextInfo(getContext(), selfExtraText, statusVisibility, localOnly);
+ if (replyTo != null) UiUtils.setExtraTextInfo(getContext(), extraText, replyTo.visibility, replyTo.localOnly);
+ }
+
private void buildVisibilityPopup(View v){
visibilityPopup=new PopupMenu(getActivity(), v);
visibilityPopup.inflate(R.menu.compose_visibility);
Menu m=visibilityPopup.getMenu();
+ MenuItem localOnlyItem = visibilityPopup.getMenu().findItem(R.id.local_only);
+ boolean prefsSaysSupported = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID);
+ if (instance.pleroma != null) {
+ m.findItem(R.id.vis_local).setVisible(true);
+ } else if (localOnly || prefsSaysSupported) {
+ localOnlyItem.setVisible(true);
+ localOnlyItem.setChecked(localOnly);
+ Status status = editingStatus != null ? editingStatus : replyTo;
+ if (!prefsSaysSupported) {
+ GlobalUserPreferences.accountsWithLocalOnlySupport.add(accountID);
+ if (GLITCH_LOCAL_ONLY_PATTERN.matcher(status.getStrippedText()).matches()) {
+ GlobalUserPreferences.accountsInGlitchMode.add(accountID);
+ }
+ GlobalUserPreferences.save();
+ }
+ }
UiUtils.enablePopupMenuIcons(getActivity(), visibilityPopup);
- m.setGroupCheckable(0, true, true);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) m.setGroupDividerEnabled(true);
visibilityPopup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
@Override
public boolean onMenuItemClick(MenuItem item){
@@ -1723,41 +1864,44 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
statusVisibility=StatusPrivacy.PRIVATE;
}else if(id==R.id.vis_private){
statusVisibility=StatusPrivacy.DIRECT;
+ }else if(id==R.id.vis_local){
+ statusVisibility=StatusPrivacy.LOCAL;
+ }
+ if (id == R.id.local_only) {
+ localOnly = !item.isChecked();
+ item.setChecked(localOnly);
+ } else {
+ item.setChecked(true);
}
- item.setChecked(true);
updateVisibilityIcon();
+ updateHeaders();
return true;
}
});
}
private void loadDefaultStatusVisibility(Bundle savedInstanceState) {
- if(getArguments().containsKey("replyTo")){
- replyTo=Parcels.unwrap(getArguments().getParcelable("replyTo"));
- statusVisibility = replyTo.visibility;
- }
+ if(replyTo != null) statusVisibility = replyTo.visibility;
// A saved privacy setting from a previous compose session wins over the reply visibility
if(savedInstanceState !=null){
statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
}
- Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences;
+ AccountSessionManager asm = AccountSessionManager.getInstance();
+ Preferences prefs = asm.getAccount(accountID).preferences;
if (prefs != null) {
// Only override the reply visibility if our preference is more private
- if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) {
- statusVisibility = switch (prefs.postingDefaultVisibility) {
- case PUBLIC -> StatusPrivacy.PUBLIC;
- case UNLISTED -> StatusPrivacy.UNLISTED;
- case PRIVATE -> StatusPrivacy.PRIVATE;
- case DIRECT -> StatusPrivacy.DIRECT;
- };
+ // (and we're not replying to ourselves, or not at all)
+ if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility) &&
+ (replyTo == null || !asm.isSelf(accountID, replyTo.account))) {
+ statusVisibility = prefs.postingDefaultVisibility;
}
+ }
- // A saved privacy setting from a previous compose session wins over all
- if(savedInstanceState !=null){
- statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
- }
+ // A saved privacy setting from a previous compose session wins over all
+ if(savedInstanceState !=null){
+ statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
}
}
@@ -1767,9 +1911,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
}
visibilityBtn.setImageResource(switch(statusVisibility){
case PUBLIC -> R.drawable.ic_fluent_earth_24_regular;
- case UNLISTED -> R.drawable.ic_fluent_people_community_24_regular;
- case PRIVATE -> R.drawable.ic_fluent_people_checkmark_24_regular;
+ case UNLISTED -> R.drawable.ic_fluent_lock_open_24_regular;
+ case PRIVATE -> R.drawable.ic_fluent_lock_closed_24_filled;
case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
+ case LOCAL -> R.drawable.ic_fluent_eye_24_regular;
});
}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
new file mode 100644
index 000000000..c947b0fa9
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -0,0 +1,352 @@
+package org.joinmastodon.android.fragments;
+
+import static android.view.Menu.NONE;
+
+import static org.joinmastodon.android.ui.utils.UiUtils.makeBackItem;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.GetLists;
+import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
+import org.joinmastodon.android.model.Hashtag;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.TimelineDefinition;
+import org.joinmastodon.android.ui.DividerItemDecoration;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.TextInputFrameLayout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
+import me.grishka.appkit.fragments.BaseRecyclerFragment;
+import me.grishka.appkit.utils.BindableViewHolder;
+import me.grishka.appkit.views.UsableRecyclerView;
+
+public class EditTimelinesFragment extends BaseRecyclerFragment implements ScrollableToTop {
+ private String accountID;
+ private TimelinesAdapter adapter;
+ private final ItemTouchHelper itemTouchHelper;
+ private Menu optionsMenu;
+ private boolean updated;
+ private final Map timelineByMenuItem = new HashMap<>();
+ private final List listTimelines = new ArrayList<>();
+ private final List hashtags = new ArrayList<>();
+
+ public EditTimelinesFragment() {
+ super(10);
+ ItemTouchHelper.SimpleCallback itemTouchCallback = new ItemTouchHelperCallback() ;
+ itemTouchHelper = new ItemTouchHelper(itemTouchCallback);
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setHasOptionsMenu(true);
+ setTitle(R.string.sk_timelines);
+ accountID = getArguments().getString("account");
+
+ new GetLists().setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(List result) {
+ listTimelines.addAll(result);
+ updateOptionsMenu();
+ }
+
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getContext());
+ }
+ }).exec(accountID);
+
+ new GetFollowedHashtags().setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(HeaderPaginationList result) {
+ hashtags.addAll(result);
+ updateOptionsMenu();
+ }
+
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getContext());
+ }
+ }).exec(accountID);
+ }
+
+ @Override
+ protected void onShown(){
+ super.onShown();
+ if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading) loadData();
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ itemTouchHelper.attachToRecyclerView(list);
+ refreshLayout.setEnabled(false);
+ list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ this.optionsMenu = menu;
+ updateOptionsMenu();
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.menu_back) {
+ updateOptionsMenu();
+ optionsMenu.performIdentifierAction(R.id.menu_add_timeline, 0);
+ return true;
+ }
+ TimelineDefinition tl = timelineByMenuItem.get(item);
+ if (tl != null) {
+ data.add(tl.copy());
+ adapter.notifyItemInserted(data.size());
+ saveTimelines();
+ updateOptionsMenu();
+ };
+ return true;
+ }
+
+ private void addTimelineToOptions(TimelineDefinition tl, Menu menu) {
+ if (data.contains(tl)) return;
+ MenuItem item = menu.add(0, View.generateViewId(), Menu.NONE, tl.getTitle(getContext()));
+ item.setIcon(tl.getIcon().iconRes);
+ timelineByMenuItem.put(item, tl);
+ }
+
+ private void updateOptionsMenu() {
+ if (getActivity() == null) return;
+ optionsMenu.clear();
+ timelineByMenuItem.clear();
+
+ SubMenu menu = optionsMenu.addSubMenu(0, R.id.menu_add_timeline, NONE, R.string.sk_timelines_add);
+ menu.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ menu.getItem().setIcon(R.drawable.ic_fluent_add_24_regular);
+
+ SubMenu timelinesMenu = menu.addSubMenu(R.string.sk_timeline);
+ timelinesMenu.getItem().setIcon(R.drawable.ic_fluent_timeline_24_regular);
+ SubMenu listsMenu = menu.addSubMenu(R.string.sk_list);
+ listsMenu.getItem().setIcon(R.drawable.ic_fluent_people_24_regular);
+ SubMenu hashtagsMenu = menu.addSubMenu(R.string.sk_hashtag);
+ hashtagsMenu.getItem().setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
+
+ makeBackItem(timelinesMenu);
+ makeBackItem(listsMenu);
+ makeBackItem(hashtagsMenu);
+
+ TimelineDefinition.ALL_TIMELINES.forEach(tl -> addTimelineToOptions(tl, timelinesMenu));
+ listTimelines.stream().map(TimelineDefinition::ofList).forEach(tl -> addTimelineToOptions(tl, listsMenu));
+ hashtags.stream().map(TimelineDefinition::ofHashtag).forEach(tl -> addTimelineToOptions(tl, hashtagsMenu));
+
+ timelinesMenu.getItem().setVisible(timelinesMenu.size() > 0);
+ listsMenu.getItem().setVisible(listsMenu.size() > 0);
+ hashtagsMenu.getItem().setVisible(hashtagsMenu.size() > 0);
+
+ UiUtils.enableOptionsMenuIcons(getContext(), optionsMenu, R.id.menu_add_timeline);
+ }
+
+ private void saveTimelines() {
+ updated = true;
+ GlobalUserPreferences.pinnedTimelines.put(accountID, data.size() > 0 ? data : List.of(TimelineDefinition.HOME_TIMELINE));
+ GlobalUserPreferences.save();
+ }
+
+ private void removeTimeline(int position) {
+ data.remove(position);
+ adapter.notifyItemRemoved(position);
+ saveTimelines();
+ updateOptionsMenu();
+ }
+
+ @Override
+ protected void doLoadData(int offset, int count){
+ onDataLoaded(GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES), false);
+ updateOptionsMenu();
+ }
+
+ @Override
+ protected RecyclerView.Adapter getAdapter() {
+ return adapter = new TimelinesAdapter();
+ }
+
+ @Override
+ public void scrollToTop() {
+ smoothScrollRecyclerViewToTop(list);
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ if (updated) UiUtils.restartApp();
+ }
+
+ private class TimelinesAdapter extends RecyclerView.Adapter{
+ @NonNull
+ @Override
+ public TimelineViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
+ return new TimelineViewHolder();
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull TimelineViewHolder holder, int position) {
+ holder.bind(data.get(position));
+ }
+
+ @Override
+ public int getItemCount() {
+ return data.size();
+ }
+ }
+
+ private class TimelineViewHolder extends BindableViewHolder implements UsableRecyclerView.Clickable{
+ private final TextView title;
+ private final ImageView dragger;
+
+ public TimelineViewHolder(){
+ super(getActivity(), R.layout.item_text, list);
+ title=findViewById(R.id.title);
+ dragger=findViewById(R.id.dragger_thingy);
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ @Override
+ public void onBind(TimelineDefinition item) {
+ title.setText(item.getTitle(getContext()));
+ title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(item.getIcon().iconRes), null, null, null);
+ dragger.setVisibility(View.VISIBLE);
+ dragger.setOnTouchListener((View v, MotionEvent event) -> {
+ if (event.getAction() == MotionEvent.ACTION_DOWN) {
+ itemTouchHelper.startDrag(this);
+ return true;
+ }
+ return false;
+ });
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ @Override
+ public void onClick() {
+ Context ctx = getContext();
+ LinearLayout view = (LinearLayout) getActivity().getLayoutInflater()
+ .inflate(R.layout.edit_timeline, (ViewGroup) itemView, false);
+
+ TextInputFrameLayout inputLayout = view.findViewById(R.id.input);
+ EditText editText = inputLayout.getEditText();
+ editText.setText(item.getCustomTitle());
+ editText.setHint(item.getDefaultTitle(ctx));
+
+ ImageButton btn = view.findViewById(R.id.button);
+ PopupMenu popup = new PopupMenu(ctx, btn);
+ TimelineDefinition.Icon currentIcon = item.getIcon();
+ btn.setImageResource(currentIcon.iconRes);
+ btn.setContentDescription(ctx.getString(currentIcon.nameRes));
+ btn.setOnTouchListener(popup.getDragToOpenListener());
+ btn.setOnClickListener(l -> popup.show());
+
+ Menu menu = popup.getMenu();
+ TimelineDefinition.Icon defaultIcon = item.getDefaultIcon();
+ menu.add(0, currentIcon.ordinal(), NONE, currentIcon.nameRes).setIcon(currentIcon.iconRes);
+ if (!currentIcon.equals(defaultIcon)) {
+ menu.add(0, defaultIcon.ordinal(), NONE, defaultIcon.nameRes).setIcon(defaultIcon.iconRes);
+ }
+ for (TimelineDefinition.Icon icon : TimelineDefinition.Icon.values()) {
+ if (icon.hidden || icon.equals(item.getIcon())) continue;
+ menu.add(0, icon.ordinal(), NONE, icon.nameRes).setIcon(icon.iconRes);
+ }
+ UiUtils.enablePopupMenuIcons(ctx, popup);
+
+ popup.setOnMenuItemClickListener(menuItem -> {
+ TimelineDefinition.Icon icon = TimelineDefinition.Icon.values()[menuItem.getItemId()];
+ btn.setImageResource(icon.iconRes);
+ btn.setContentDescription(ctx.getString(icon.nameRes));
+ item.setIcon(icon);
+ return true;
+ });
+
+ new M3AlertDialogBuilder(ctx)
+ .setTitle(R.string.sk_edit_timeline)
+ .setView(view)
+ .setPositiveButton(R.string.save, (d, which) -> {
+ item.setTitle(editText.getText().toString().trim());
+ rebind();
+ saveTimelines();
+ })
+ .setNeutralButton(R.string.sk_remove, (d, which) ->
+ removeTimeline(getAbsoluteAdapterPosition()))
+ .setNegativeButton(R.string.cancel, (d, which) -> {})
+ .show();
+
+ btn.requestFocus();
+ }
+ }
+
+ private class ItemTouchHelperCallback extends ItemTouchHelper.SimpleCallback {
+ public ItemTouchHelperCallback() {
+ super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT);
+ }
+
+ @Override
+ public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
+ int fromPosition = viewHolder.getAbsoluteAdapterPosition();
+ int toPosition = target.getAbsoluteAdapterPosition();
+ if (Math.max(fromPosition, toPosition) >= data.size() || Math.min(fromPosition, toPosition) < 0) {
+ return false;
+ } else {
+ Collections.swap(data, fromPosition, toPosition);
+ adapter.notifyItemMoved(fromPosition, toPosition);
+ saveTimelines();
+ return true;
+ }
+ }
+
+ @Override
+ public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState) {
+ if (actionState == ItemTouchHelper.ACTION_STATE_DRAG && viewHolder != null) {
+ viewHolder.itemView.animate().alpha(0.65f);
+ }
+ }
+
+ @Override
+ public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
+ super.clearView(recyclerView, viewHolder);
+ viewHolder.itemView.animate().alpha(1f);
+ }
+
+ @Override
+ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
+ int position = viewHolder.getAbsoluteAdapterPosition();
+ removeTimeline(position);
+ }
+ }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FabStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FabStatusListFragment.java
deleted file mode 100644
index c4443a2c8..000000000
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FabStatusListFragment.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.joinmastodon.android.fragments;
-
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ImageButton;
-
-import org.joinmastodon.android.R;
-import org.joinmastodon.android.ui.utils.UiUtils;
-
-import me.grishka.appkit.Nav;
-
-public abstract class FabStatusListFragment extends StatusListFragment {
- protected ImageButton fab;
-
- public FabStatusListFragment() {
- setListLayoutId(R.layout.recycler_fragment_with_fab);
- }
-
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- fab = view.findViewById(R.id.fab);
- fab.setOnClickListener(this::onFabClick);
- fab.setOnLongClickListener(this::onFabLongClick);
- }
-
- protected void onFabClick(View v){
- Bundle args=new Bundle();
- args.putString("account", accountID);
- Nav.go(getActivity(), ComposeFragment.class, args);
- }
-
- protected boolean onFabLongClick(View v) {
- return UiUtils.pickAccountForCompose(getActivity(), accountID);
- }
-}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java
index f0779e71a..31fdd8442 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java
@@ -25,6 +25,7 @@ public class FavoritedStatusListFragment extends StatusListFragment{
.setCallback(new SimpleCallback<>(this){
@Override
public void onSuccess(HeaderPaginationList result){
+ if (getActivity() == null) return;
if(result.nextPageUri!=null)
nextMaxID=result.nextPageUri.getQueryParameter("max_id");
else
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
index 8f2b35fcf..76b28334f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
@@ -80,6 +80,7 @@ public class FollowRequestsListFragment extends BaseRecyclerFragment(this){
@Override
public void onSuccess(HeaderPaginationList result){
+ if (getActivity() == null) return;
if(result.nextPageUri!=null)
nextMaxID=result.nextPageUri.getQueryParameter("max_id");
else
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
index 1a9ecb862..cdb729841 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
@@ -55,6 +55,7 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment impl
.setCallback(new SimpleCallback<>(this){
@Override
public void onSuccess(HeaderPaginationList result){
+ if (getActivity() == null) return;
if(result.nextPageUri!=null)
nextMaxID=result.nextPageUri.getQueryParameter("max_id");
else
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
index 74c3185ed..ce95a9731 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments;
import android.app.Activity;
import android.os.Bundle;
+import android.view.HapticFeedbackConstants;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -10,15 +11,21 @@ import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.Toast;
+import org.joinmastodon.android.E;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.tags.GetHashtag;
import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
+import org.joinmastodon.android.events.HashtagUpdatedEvent;
+import org.joinmastodon.android.model.Filter;
import org.joinmastodon.android.model.Hashtag;
import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.TimelineDefinition;
import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
import java.util.List;
+import java.util.stream.Collectors;
import me.grishka.appkit.Nav;
import me.grishka.appkit.api.Callback;
@@ -26,14 +33,14 @@ import me.grishka.appkit.api.ErrorResponse;
import me.grishka.appkit.api.SimpleCallback;
import me.grishka.appkit.utils.V;
-public class HashtagTimelineFragment extends StatusListFragment{
+public class HashtagTimelineFragment extends PinnableStatusListFragment {
private String hashtag;
private boolean following;
- private ImageButton fab;
private MenuItem followButton;
- public HashtagTimelineFragment(){
- setListLayoutId(R.layout.recycler_fragment_with_fab);
+ @Override
+ protected boolean withComposeButton() {
+ return true;
}
@Override
@@ -41,7 +48,6 @@ public class HashtagTimelineFragment extends StatusListFragment{
super.onAttach(activity);
updateTitle(getArguments().getString("hashtag"));
following=getArguments().getBoolean("following", false);
-
setHasOptionsMenu(true);
}
@@ -54,35 +60,20 @@ public class HashtagTimelineFragment extends StatusListFragment{
this.following = newFollowing;
followButton.setTitle(getString(newFollowing ? R.string.unfollow_user : R.string.follow_user, "#" + hashtag));
followButton.setIcon(newFollowing ? R.drawable.ic_fluent_person_delete_24_filled : R.drawable.ic_fluent_person_add_24_regular);
+ E.post(new HashtagUpdatedEvent(hashtag, following));
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
inflater.inflate(R.menu.hashtag_timeline, menu);
+ super.onCreateOptionsMenu(menu, inflater);
followButton = menu.findItem(R.id.follow_hashtag);
updateFollowingState(following);
- followButton.setOnMenuItemClickListener(i -> {
- updateFollowingState(!following);
- new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
- @Override
- public void onSuccess(Hashtag i) {
- if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
- updateFollowingState(i.following);
- }
-
- @Override
- public void onError(ErrorResponse error) {
- error.showToast(getActivity());
- updateFollowingState(!following);
- }
- }).exec(accountID);
- return true;
- });
-
new GetHashtag(hashtag).setCallback(new Callback<>() {
@Override
public void onSuccess(Hashtag hashtag) {
+ if (getActivity() == null) return;
updateTitle(hashtag.name);
updateFollowingState(hashtag.following);
}
@@ -94,12 +85,45 @@ public class HashtagTimelineFragment extends StatusListFragment{
}).exec(accountID);
}
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (super.onOptionsItemSelected(item)) return true;
+ if (item.getItemId() == R.id.follow_hashtag) {
+ updateFollowingState(!following);
+ getToolbar().performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK);
+ new SetHashtagFollowed(hashtag, following).setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(Hashtag i) {
+ if (getActivity() == null) return;
+ if (i.following == following) Toast.makeText(getActivity(), getString(i.following ? R.string.followed_user : R.string.unfollowed_user, "#" + i.name), Toast.LENGTH_SHORT).show();
+ updateFollowingState(i.following);
+ }
+
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getActivity());
+ updateFollowingState(!following);
+ }
+ }).exec(accountID);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ protected TimelineDefinition makeTimelineDefinition() {
+ return TimelineDefinition.ofHashtag(hashtag);
+ }
+
@Override
protected void doLoadData(int offset, int count){
currentRequest=new GetHashtagTimeline(hashtag, offset==0 ? null : getMaxID(), null, count)
.setCallback(new SimpleCallback<>(this){
@Override
public void onSuccess(List result){
+ if (getActivity() == null) return;
+ result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList());
onDataLoaded(result, !result.isEmpty());
}
})
@@ -114,14 +138,12 @@ public class HashtagTimelineFragment extends StatusListFragment{
}
@Override
- public void onViewCreated(View view, Bundle savedInstanceState){
- super.onViewCreated(view, savedInstanceState);
- fab=view.findViewById(R.id.fab);
- fab.setOnClickListener(this::onFabClick);
- fab.setOnLongClickListener(v -> UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' '));
+ protected boolean onFabLongClick(View v) {
+ return UiUtils.pickAccountForCompose(getActivity(), accountID, '#'+hashtag+' ');
}
- private void onFabClick(View v){
+ @Override
+ protected void onFabClick(View v){
Bundle args=new Bundle();
args.putString("account", accountID);
args.putString("prefilledText", '#'+hashtag+' ');
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 7ff7b536b..323fa60f5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -16,12 +16,10 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import org.joinmastodon.android.PushNotificationReceiver;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.session.AccountSession;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.fragments.discover.DiscoverFragment;
-import org.joinmastodon.android.fragments.discover.SearchFragment;
import org.joinmastodon.android.model.Account;
import org.joinmastodon.android.ui.AccountSwitcherSheet;
import org.joinmastodon.android.ui.utils.UiUtils;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
index 7f7dfcb79..37ce0e002 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
@@ -1,5 +1,7 @@
package org.joinmastodon.android.fragments;
+import static org.joinmastodon.android.GlobalUserPreferences.reduceMotion;
+
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
@@ -39,21 +41,26 @@ import org.joinmastodon.android.R;
import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
import org.joinmastodon.android.api.requests.lists.GetLists;
import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
+import org.joinmastodon.android.events.HashtagUpdatedEvent;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
-import org.joinmastodon.android.fragments.discover.FederatedTimelineFragment;
-import org.joinmastodon.android.fragments.discover.LocalTimelineFragment;
import org.joinmastodon.android.model.Announcement;
import org.joinmastodon.android.model.Hashtag;
import org.joinmastodon.android.model.HeaderPaginationList;
import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.model.TimelineDefinition;
import org.joinmastodon.android.ui.SimpleViewHolder;
import org.joinmastodon.android.ui.utils.UiUtils;
import org.joinmastodon.android.updater.GithubSelfUpdater;
-import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
import me.grishka.appkit.Nav;
import me.grishka.appkit.api.Callback;
@@ -67,14 +74,12 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
private static final int ANNOUNCEMENTS_RESULT = 654;
private String accountID;
- private MenuItem announcements;
+ private MenuItem announcements, announcementsAction, settings, settingsAction;
// private ImageView toolbarLogo;
private Button toolbarShowNewPostsBtn;
private boolean newPostsBtnShown;
private AnimatorSet currentNewPostsAnim;
private ViewPager2 pager;
- private final List fragments = new ArrayList<>();
- private final List tabViews = new ArrayList<>();
private View switcher;
private FrameLayout toolbarFrame;
private ImageView timelineIcon;
@@ -83,11 +88,29 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
private PopupMenu switcherPopup;
private final Map listItems = new HashMap<>();
private final Map hashtagsItems = new HashMap<>();
+ private List timelineDefinitions;
+ private int count;
+ private Fragment[] fragments;
+ private FrameLayout[] tabViews;
+ private TimelineDefinition[] timelines;
+ private final Map timelinesByMenuItem = new HashMap<>();
+ private SubMenu hashtagsMenu, listsMenu;
+ private PopupMenu overflowPopup;
+ private View overflowActionView = null;
+ private boolean announcementsBadged, settingsBadged;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ E.register(this);
accountID = getArguments().getString("account");
+ timelineDefinitions = GlobalUserPreferences.pinnedTimelines.getOrDefault(accountID, TimelineDefinition.DEFAULT_TIMELINES);
+ assert timelineDefinitions != null;
+ if (timelineDefinitions.size() == 0) timelineDefinitions = List.of(TimelineDefinition.HOME_TIMELINE);
+ count = timelineDefinitions.size();
+ fragments = new Fragment[count];
+ tabViews = new FrameLayout[count];
+ timelines = new TimelineDefinition[count];
}
@Override
@@ -102,31 +125,40 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
pager = new ViewPager2(getContext());
toolbarFrame = (FrameLayout) LayoutInflater.from(getContext()).inflate(R.layout.home_toolbar, getToolbar(), false);
- if (fragments.size() == 0) {
+ if (fragments[0] == null) {
Bundle args = new Bundle();
args.putString("account", accountID);
args.putBoolean("__is_tab", true);
+ args.putBoolean("onlyPosts", true);
- fragments.add(new HomeTimelineFragment());
- fragments.add(new LocalTimelineFragment());
- if (GlobalUserPreferences.showFederatedTimeline) fragments.add(new FederatedTimelineFragment());
+ for (int i = 0; i < timelineDefinitions.size(); i++) {
+ TimelineDefinition tl = timelineDefinitions.get(i);
+ fragments[i] = tl.getFragment();
+ timelines[i] = tl;
+ }
FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
- for (int i = 0; i < fragments.size(); i++) {
- fragments.get(i).setArguments(args);
+ for (int i = 0; i < count; i++) {
+ fragments[i].setArguments(timelines[i].populateArguments(new Bundle(args)));
FrameLayout tabView = new FrameLayout(getActivity());
tabView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
tabView.setVisibility(View.GONE);
tabView.setId(i + 1);
- transaction.add(i + 1, fragments.get(i));
+ transaction.add(i + 1, fragments[i]);
view.addView(tabView);
- tabViews.add(tabView);
+ tabViews[i] = tabView;
}
transaction.commit();
}
view.addView(pager, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ overflowActionView = UiUtils.makeOverflowActionView(getContext());
+ overflowPopup = new PopupMenu(getContext(), overflowActionView);
+ overflowPopup.setOnMenuItemClickListener(this::onOptionsItemSelected);
+ overflowActionView.setOnClickListener(l -> overflowPopup.show());
+ overflowActionView.setOnTouchListener(overflowPopup.getDragToOpenListener());
+
return view;
}
@@ -140,37 +172,36 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
collapsedChevron = toolbarFrame.findViewById(R.id.collapsed_chevron);
switcher = toolbarFrame.findViewById(R.id.switcher_btn);
switcherPopup = new PopupMenu(getContext(), switcher);
- switcherPopup.inflate(R.menu.home_switcher);
switcherPopup.setOnMenuItemClickListener(this::onSwitcherItemSelected);
UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
- switcher.setOnClickListener(v->{
- updateSwitcherMenu();
- switcherPopup.show();
- });
- View.OnTouchListener listener = switcherPopup.getDragToOpenListener();
- switcher.setOnTouchListener((v, m)-> {
- updateSwitcherMenu();
- return listener.onTouch(v, m);
- });
+ switcher.setOnClickListener(v->switcherPopup.show());
+ switcher.setOnTouchListener(switcherPopup.getDragToOpenListener());
+ updateSwitcherMenu();
UiUtils.reduceSwipeSensitivity(pager);
pager.setUserInputEnabled(!GlobalUserPreferences.disableSwipe);
pager.setAdapter(new HomePagerAdapter());
- pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback(){
+ pager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override
public void onPageSelected(int position){
+ if (!reduceMotion) {
+ // setting this here because page transformer appears to fire too late so the
+ // animation can appear bumpy, especially when navigating to a further-away tab
+ switcher.setScaleY(0.85f);
+ switcher.setScaleX(0.85f);
+ switcher.setAlpha(0.65f);
+ }
updateSwitcherIcon(position);
- if (position==0) return;
- hideNewPostsButton();
- if (fragments.get(position) instanceof BaseRecyclerFragment page){
+ if (!timelines[position].equals(TimelineDefinition.HOME_TIMELINE)) hideNewPostsButton();
+ if (fragments[position] instanceof BaseRecyclerFragment page){
if(!page.loaded && !page.isDataLoading()) page.loadData();
}
}
});
- if (!GlobalUserPreferences.reduceMotion) {
+ if (!reduceMotion) {
pager.setPageTransformer((v, pos) -> {
- if (tabViews.get(pager.getCurrentItem()) != v) return;
+ if (reduceMotion || tabViews[pager.getCurrentItem()] != v) return;
float scaleFactor = Math.max(0.85f, 1 - Math.abs(pos) * 0.06f);
switcher.setScaleY(scaleFactor);
switcher.setScaleX(scaleFactor);
@@ -180,15 +211,37 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
updateToolbarLogo();
+ ViewTreeObserver vto = getToolbar().getViewTreeObserver();
+ if (vto.isAlive()) {
+ vto.addOnGlobalLayoutListener(() -> {
+ Toolbar t = getToolbar();
+ if (t == null) return;
+ int toolbarWidth = t.getWidth();
+ if (toolbarWidth == 0) return;
+
+ int toolbarFrameWidth = toolbarFrame.getWidth();
+ int padding = toolbarWidth - toolbarFrameWidth;
+ FrameLayout parent = ((FrameLayout) toolbarShowNewPostsBtn.getParent());
+ if (padding == parent.getPaddingStart()) return;
+
+ // toolbar frame goes from screen edge to beginning of right-aligned option buttons.
+ // centering button by applying the same space on the left
+ parent.setPaddingRelative(padding, 0, 0, 0);
+ toolbarShowNewPostsBtn.setMaxWidth(toolbarWidth - padding * 2);
+
+ switcher.setPivotX(V.dp(28)); // padding + half of icon
+ switcher.setPivotY(switcher.getHeight() / 2f);
+ });
+ }
+
if(GithubSelfUpdater.needSelfUpdating()){
- E.register(this);
updateUpdateState(GithubSelfUpdater.getInstance().getState());
}
new GetLists().setCallback(new Callback<>() {
@Override
public void onSuccess(List lists) {
- addItemsToMap(lists, listItems);
+ updateList(lists, listItems);
}
@Override
@@ -200,7 +253,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
new GetFollowedHashtags().setCallback(new Callback<>() {
@Override
public void onSuccess(HeaderPaginationList hashtags) {
- addItemsToMap(hashtags, hashtagsItems);
+ updateList(hashtags, hashtagsItems);
}
@Override
@@ -208,6 +261,47 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
error.showToast(getContext());
}
}).exec(accountID);
+
+ new GetAnnouncements(false).setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(List result) {
+ if (getActivity() == null) return;
+ if (result.stream().anyMatch(a -> !a.read)) {
+ announcementsBadged = true;
+ announcements.setVisible(false);
+ announcementsAction.setVisible(true);
+ }
+ }
+
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getActivity());
+ }
+ }).exec(accountID);
+ }
+
+ private void addListsToOverflowMenu() {
+ Context ctx = getContext();
+ listsMenu.clear();
+ listsMenu.getItem().setVisible(listItems.size() > 0);
+ UiUtils.insetPopupMenuIcon(ctx, UiUtils.makeBackItem(listsMenu));
+ listItems.forEach((id, list) -> {
+ MenuItem item = listsMenu.add(Menu.NONE, id, Menu.NONE, list.title);
+ item.setIcon(R.drawable.ic_fluent_people_24_regular);
+ UiUtils.insetPopupMenuIcon(ctx, item);
+ });
+ }
+
+ private void addHashtagsToOverflowMenu() {
+ Context ctx = getContext();
+ hashtagsMenu.clear();
+ hashtagsMenu.getItem().setVisible(hashtagsItems.size() > 0);
+ UiUtils.insetPopupMenuIcon(ctx, UiUtils.makeBackItem(hashtagsMenu));
+ hashtagsItems.forEach((id, hashtag) -> {
+ MenuItem item = hashtagsMenu.add(Menu.NONE, id, Menu.NONE, hashtag.name);
+ item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
+ UiUtils.insetPopupMenuIcon(ctx, item);
+ });
}
public void updateToolbarLogo(){
@@ -222,11 +316,6 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
updateSwitcherIcon(pager.getCurrentItem());
-// toolbarLogo=new ImageView(getActivity());
-// toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
-// toolbarLogo.setImageResource(R.drawable.logo);
-// toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
-
toolbarShowNewPostsBtn=toolbarFrame.findViewById(R.id.show_new_posts_btn);
toolbarShowNewPostsBtn.setCompoundDrawableTintList(toolbarShowNewPostsBtn.getTextColors());
if(Build.VERSION.SDK_INT= Build.VERSION_CODES.P) {
+ m.setGroupDividerEnabled(true);
}
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
inflater.inflate(R.menu.home, menu);
- announcements = menu.findItem(R.id.announcements);
- new GetAnnouncements(false).setCallback(new Callback<>() {
- @Override
- public void onSuccess(List result) {
- boolean hasUnread = result.stream().anyMatch(a -> !a.read);
- announcements.setIcon(hasUnread ? R.drawable.ic_announcements_24_badged : R.drawable.ic_fluent_megaphone_24_regular);
- }
+ menu.findItem(R.id.overflow).setActionView(overflowActionView);
+ announcementsAction = menu.findItem(R.id.announcements_action);
+ settingsAction = menu.findItem(R.id.settings_action);
- @Override
- public void onError(ErrorResponse error) {
- error.showToast(getActivity());
- }
- }).exec(accountID);
+ updateOverflowMenu();
}
- private void addItemsToMap(List addItems, Map items) {
- if (addItems.size() == 0) return;
+ private void updateList(List addItems, Map items) {
+ if (addItems.size() == 0 || getActivity() == null) return;
for (int i = 0; i < addItems.size(); i++) items.put(View.generateViewId(), addItems.get(i));
- updateSwitcherMenu();
+ updateOverflowMenu();
}
private void updateSwitcherMenu() {
- Context context = getContext();
- switcherPopup.getMenu().findItem(R.id.federated).setVisible(GlobalUserPreferences.showFederatedTimeline);
+ Menu switcherMenu = switcherPopup.getMenu();
+ switcherMenu.clear();
+ timelinesByMenuItem.clear();
- if (!listItems.isEmpty()) {
- MenuItem listsItem = switcherPopup.getMenu().findItem(R.id.lists);
- listsItem.setVisible(true);
- SubMenu listsMenu = listsItem.getSubMenu();
- listsMenu.clear();
- listItems.forEach((id, list) -> {
- MenuItem item = listsMenu.add(Menu.NONE, id, Menu.NONE, list.title);
- item.setIcon(R.drawable.ic_fluent_people_list_24_regular);
- UiUtils.insetPopupMenuIcon(context, item);
- });
+ for (TimelineDefinition tl : timelines) {
+ int menuItemId = View.generateViewId();
+ timelinesByMenuItem.put(menuItemId, tl);
+ MenuItem item = switcherMenu.add(0, menuItemId, 0, tl.getTitle(getContext()));
+ item.setIcon(tl.getIcon().iconRes);
}
- if (!hashtagsItems.isEmpty()) {
- MenuItem hashtagsItem = switcherPopup.getMenu().findItem(R.id.followed_hashtags);
- hashtagsItem.setVisible(true);
- SubMenu hashtagsMenu = hashtagsItem.getSubMenu();
- hashtagsMenu.clear();
- hashtagsItems.forEach((id, hashtag) -> {
- MenuItem item = hashtagsMenu.add(Menu.NONE, id, Menu.NONE, hashtag.name);
- item.setIcon(R.drawable.ic_fluent_number_symbol_24_regular);
- UiUtils.insetPopupMenuIcon(context, item);
- });
- }
+ UiUtils.enablePopupMenuIcons(getContext(), switcherPopup);
}
private boolean onSwitcherItemSelected(MenuItem item) {
int id = item.getItemId();
- ListTimeline list;
- Hashtag hashtag;
- if (id == R.id.home) {
- navigateTo(0);
+
+ Bundle args = new Bundle();
+ args.putString("account", accountID);
+
+ if (id == R.id.menu_back) {
+ switcher.post(() -> switcherPopup.show());
return true;
- } else if (id == R.id.local) {
- navigateTo(1);
- return true;
- } else if (id == R.id.federated) {
- navigateTo(2);
- return true;
- } else if ((list = listItems.get(id)) != null) {
- Bundle args = new Bundle();
- args.putString("account", accountID);
- args.putString("listID", list.id);
- args.putString("listTitle", list.title);
- args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
- Nav.go(getActivity(), ListTimelineFragment.class, args);
- } else if ((hashtag = hashtagsItems.get(id)) != null) {
- UiUtils.openHashtagTimeline(getActivity(), accountID, hashtag.name, hashtag.following);
}
+
+ TimelineDefinition tl = timelinesByMenuItem.get(id);
+ if (tl != null) {
+ for (int i = 0; i < timelines.length; i++) {
+ if (timelines[i] == tl) {
+ navigateTo(i);
+ return true;
+ }
+ }
+ }
+
return false;
}
-
private void navigateTo(int i) {
- navigateTo(i, !GlobalUserPreferences.reduceMotion);
+ navigateTo(i, !reduceMotion);
}
private void navigateTo(int i, boolean smooth) {
@@ -365,32 +428,43 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
}
private void updateSwitcherIcon(int i) {
- timelineIcon.setImageResource(switch (i) {
- default -> R.drawable.ic_fluent_home_24_regular;
- case 1 -> R.drawable.ic_fluent_people_community_24_regular;
- case 2 -> R.drawable.ic_fluent_earth_24_regular;
- });
- timelineTitle.setText(switch (i) {
- default -> R.string.sk_timeline_home;
- case 1 -> R.string.sk_timeline_local;
- case 2 -> R.string.sk_timeline_federated;
- });
+ timelineIcon.setImageResource(timelines[i].getIcon().iconRes);
+ timelineTitle.setText(timelines[i].getTitle(getContext()));
}
@Override
public boolean onOptionsItemSelected(MenuItem item){
Bundle args=new Bundle();
args.putString("account", accountID);
- if (item.getItemId() == R.id.settings) Nav.go(getActivity(), SettingsFragment.class, args);
- if (item.getItemId() == R.id.announcements) {
+ int id = item.getItemId();
+ ListTimeline list;
+ Hashtag hashtag;
+
+ if (item.getItemId() == R.id.menu_back) {
+ getToolbar().post(() -> overflowPopup.show());
+ return true;
+ } else if (id == R.id.settings || id == R.id.settings_action) {
+ Nav.go(getActivity(), SettingsFragment.class, args);
+ } else if (id == R.id.announcements || id == R.id.announcements_action) {
Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
+ } else if (id == R.id.edit_timelines) {
+ Nav.go(getActivity(), EditTimelinesFragment.class, args);
+ } else if ((list = listItems.get(id)) != null) {
+ args.putString("listID", list.id);
+ args.putString("listTitle", list.title);
+ if (list.repliesPolicy != null) args.putInt("repliesPolicy", list.repliesPolicy.ordinal());
+ Nav.go(getActivity(), ListTimelineFragment.class, args);
+ } else if ((hashtag = hashtagsItems.get(id)) != null) {
+ args.putString("hashtag", hashtag.name);
+ args.putBoolean("following", hashtag.following);
+ Nav.go(getActivity(), HashtagTimelineFragment.class, args);
}
return true;
}
@Override
public void scrollToTop(){
- ((ScrollableToTop) fragments.get(pager.getCurrentItem())).scrollToTop();
+ ((ScrollableToTop) fragments[pager.getCurrentItem()]).scrollToTop();
}
public void hideNewPostsButton(){
@@ -411,7 +485,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, .8f),
ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 0f)
);
- set.setDuration(GlobalUserPreferences.reduceMotion ? 0 : 300);
+ set.setDuration(reduceMotion ? 0 : 300);
set.setInterpolator(CubicBezierInterpolator.DEFAULT);
set.addListener(new AnimatorListenerAdapter(){
@Override
@@ -426,7 +500,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
}
public void showNewPostsButton(){
- if(newPostsBtnShown || pager == null || pager.getCurrentItem() != 0)
+ if(newPostsBtnShown || pager == null || !timelines[pager.getCurrentItem()].equals(TimelineDefinition.HOME_TIMELINE))
return;
newPostsBtnShown=true;
if(currentNewPostsAnim!=null){
@@ -444,7 +518,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
ObjectAnimator.ofFloat(toolbarShowNewPostsBtn, View.SCALE_Y, 1f),
ObjectAnimator.ofFloat(collapsedChevron, View.ALPHA, 1f)
);
- set.setDuration(GlobalUserPreferences.reduceMotion ? 0 : 300);
+ set.setDuration(reduceMotion ? 0 : 300);
set.setInterpolator(CubicBezierInterpolator.DEFAULT);
set.addListener(new AnimatorListenerAdapter(){
@Override
@@ -469,15 +543,20 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
}
@Override
- public void onFragmentResult(int reqCode, boolean noMoreUnread, Bundle result){
- if (reqCode == ANNOUNCEMENTS_RESULT && noMoreUnread) {
- announcements.setIcon(R.drawable.ic_fluent_megaphone_24_regular);
+ public void onFragmentResult(int reqCode, boolean success, Bundle result){
+ if (reqCode == ANNOUNCEMENTS_RESULT && success) {
+ announcementsBadged = false;
+ announcements.setVisible(true);
+ announcementsAction.setVisible(false);
}
}
private void updateUpdateState(GithubSelfUpdater.UpdateState state){
- if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING)
- getToolbar().getMenu().findItem(R.id.settings).setIcon(R.drawable.ic_settings_24_badged);
+ if(state!=GithubSelfUpdater.UpdateState.NO_UPDATE && state!=GithubSelfUpdater.UpdateState.CHECKING) {
+ settingsBadged = true;
+ settingsAction.setVisible(true);
+ settings.setVisible(false);
+ }
}
@Subscribe
@@ -497,11 +576,26 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
@Override
public void onDestroyView(){
super.onDestroyView();
+ if (overflowPopup != null) {
+ overflowPopup.dismiss();
+ overflowPopup = null;
+ }
+ if (switcherPopup != null) {
+ switcherPopup.dismiss();
+ switcherPopup = null;
+ }
if(GithubSelfUpdater.needSelfUpdating()){
E.unregister(this);
}
}
+ @Override
+ protected void onShown() {
+ super.onShown();
+ Object pinnedTimelines = GlobalUserPreferences.pinnedTimelines.get(accountID);
+ if (pinnedTimelines != null && timelineDefinitions != pinnedTimelines) UiUtils.restartApp();
+ }
+
@Override
public void onViewStateRestored(Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
@@ -515,12 +609,61 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
outState.putInt("selectedTab", pager.getCurrentItem());
}
+ @Subscribe
+ public void onHashtagUpdatedEvent(HashtagUpdatedEvent event) {
+ handleListEvent(hashtagsItems, h -> h.name.equalsIgnoreCase(event.name), event.following, () -> {
+ Hashtag hashtag = new Hashtag();
+ hashtag.name = event.name;
+ hashtag.following = true;
+ return hashtag;
+ });
+ }
+
+ @Subscribe
+ public void onListDeletedEvent(ListDeletedEvent event) {
+ handleListEvent(listItems, l -> l.id.equals(event.id), false, null);
+ }
+
+ @Subscribe
+ public void onListUpdatedCreatedEvent(ListUpdatedCreatedEvent event) {
+ handleListEvent(listItems, l -> l.id.equals(event.id), true, () -> {
+ ListTimeline list = new ListTimeline();
+ list.id = event.id;
+ list.title = event.title;
+ list.repliesPolicy = event.repliesPolicy;
+ return list;
+ });
+ }
+
+ private void handleListEvent(
+ Map existingThings,
+ Predicate matchExisting,
+ boolean shouldBeInList,
+ Supplier makeNewThing
+ ) {
+ Optional> existingThing = existingThings.entrySet().stream()
+ .filter(e -> matchExisting.test(e.getValue())).findFirst();
+ if (shouldBeInList) {
+ existingThings.put(existingThing.isPresent()
+ ? existingThing.get().getKey() : View.generateViewId(), makeNewThing.get());
+ updateOverflowMenu();
+ } else if (existingThing.isPresent() && !shouldBeInList) {
+ existingThings.remove(existingThing.get().getKey());
+ updateOverflowMenu();
+ }
+ }
+
+ public Collection getHashtags() {
+ return hashtagsItems.values();
+ }
+
private class HomePagerAdapter extends RecyclerView.Adapter {
@NonNull
@Override
public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- FrameLayout tabView = tabViews.get(viewType % getItemCount());
- ((ViewGroup)tabView.getParent()).removeView(tabView);
+ FrameLayout tabView = tabViews[viewType % getItemCount()];
+ ViewGroup tabParent = (ViewGroup) tabView.getParent();
+ if (tabParent != null) tabParent.removeView(tabView);
tabView.setVisibility(View.VISIBLE);
return new SimpleViewHolder(tabView);
}
@@ -530,7 +673,7 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab
@Override
public int getItemCount(){
- return fragments.size();
+ return count;
}
@Override
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 0b2e43884..60203b167 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -8,6 +8,9 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import org.joinmastodon.android.GlobalUserPreferences;
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.markers.SaveMarkers;
import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
import org.joinmastodon.android.api.session.AccountSessionManager;
import org.joinmastodon.android.events.StatusCreatedEvent;
@@ -29,9 +32,15 @@ import me.grishka.appkit.api.ErrorResponse;
import me.grishka.appkit.api.SimpleCallback;
import me.grishka.appkit.utils.V;
-public class HomeTimelineFragment extends FabStatusListFragment {
+public class HomeTimelineFragment extends StatusListFragment {
private HomeTabFragment parent;
private String maxID;
+ private String lastSavedMarkerID;
+
+ @Override
+ protected boolean withComposeButton() {
+ return true;
+ }
@Override
public void onAttach(Activity activity){
@@ -54,8 +63,7 @@ public class HomeTimelineFragment extends FabStatusListFragment {
.getHomeTimeline(offset>0 ? maxID : null, count, refreshing, new SimpleCallback<>(this){
@Override
public void onSuccess(CacheablePaginatedResponse> result){
- if(getActivity()==null)
- return;
+ if (getActivity() == null) return;
List filteredItems = filterPosts(result.items);
onDataLoaded(filteredItems, !result.items.isEmpty());
maxID=result.maxID;
@@ -91,6 +99,29 @@ public class HomeTimelineFragment extends FabStatusListFragment {
}
}
+ @Override
+ protected void onHidden(){
+ super.onHidden();
+ if(!data.isEmpty()){
+ String topPostID=displayItems.get(Math.max(0, list.getChildAdapterPosition(list.getChildAt(0))-getMainAdapterOffset())).parentID;
+ if(!topPostID.equals(lastSavedMarkerID)){
+ lastSavedMarkerID=topPostID;
+ new SaveMarkers(topPostID, null)
+ .setCallback(new Callback<>(){
+ @Override
+ public void onSuccess(SaveMarkers.Response result){
+ }
+
+ @Override
+ public void onError(ErrorResponse error){
+ lastSavedMarkerID=null;
+ }
+ })
+ .exec(accountID);
+ }
+ }
+ }
+
public void onStatusCreated(StatusCreatedEvent ev){
prependItems(Collections.singletonList(ev.status), true);
}
@@ -123,7 +154,7 @@ public class HomeTimelineFragment extends FabStatusListFragment {
toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
if(!toAdd.isEmpty()){
prependItems(toAdd, true);
- if (parent != null) parent.showNewPostsButton();
+ if (parent != null && GlobalUserPreferences.showNewPostsButton) parent.showNewPostsButton();
AccountSessionManager.getInstance().getAccount(accountID).getCacheController().putHomeTimeline(toAdd, false);
}
}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/IsOnTop.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/IsOnTop.java
index 3b1c999e9..071e44775 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/IsOnTop.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/IsOnTop.java
@@ -1,11 +1,13 @@
package org.joinmastodon.android.fragments;
+import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
public interface IsOnTop {
boolean isOnTop();
- default boolean isRecyclerViewOnTop(RecyclerView list) {
+ default boolean isRecyclerViewOnTop(@Nullable RecyclerView list) {
+ if (list == null) return true;
return !list.canScrollVertically(-1);
}
}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 236636370..79422cbb7 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -9,17 +9,26 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
+import androidx.annotation.Nullable;
+
+import org.joinmastodon.android.E;
import org.joinmastodon.android.R;
-import org.joinmastodon.android.api.requests.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.GetList;
import org.joinmastodon.android.api.requests.lists.UpdateList;
import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
+import org.joinmastodon.android.model.Filter;
import org.joinmastodon.android.model.ListTimeline;
import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.model.TimelineDefinition;
import org.joinmastodon.android.ui.M3AlertDialogBuilder;
import org.joinmastodon.android.ui.utils.UiUtils;
import org.joinmastodon.android.ui.views.ListTimelineEditor;
+import org.joinmastodon.android.utils.StatusFilterPredicate;
import java.util.List;
+import java.util.stream.Collectors;
import me.grishka.appkit.Nav;
import me.grishka.appkit.api.Callback;
@@ -28,14 +37,15 @@ import me.grishka.appkit.api.SimpleCallback;
import me.grishka.appkit.utils.V;
-public class ListTimelineFragment extends StatusListFragment {
+public class ListTimelineFragment extends PinnableStatusListFragment {
private String listID;
private String listTitle;
+ @Nullable
private ListTimeline.RepliesPolicy repliesPolicy;
- private ImageButton fab;
- public ListTimelineFragment() {
- setListLayoutId(R.layout.recycler_fragment_with_fab);
+ @Override
+ protected boolean withComposeButton() {
+ return true;
}
@Override
@@ -48,39 +58,58 @@ public class ListTimelineFragment extends StatusListFragment {
setTitle(listTitle);
setHasOptionsMenu(true);
+
+ new GetList(listID).setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(ListTimeline listTimeline) {
+ if (getActivity() == null) return;
+ // TODO: save updated info
+ if (!listTimeline.title.equals(listTitle)) setTitle(listTimeline.title);
+ if (listTimeline.repliesPolicy != null && !listTimeline.repliesPolicy.equals(repliesPolicy)) {
+ repliesPolicy = listTimeline.repliesPolicy;
+ }
+ }
+
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getContext());
+ }
+ });
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.list, menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ UiUtils.enableOptionsMenuIcons(getContext(), menu, R.id.pin);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
- Bundle args = new Bundle();
- args.putString("listID", listID);
+ if (super.onOptionsItemSelected(item)) return true;
if (item.getItemId() == R.id.edit) {
ListTimelineEditor editor = new ListTimelineEditor(getContext());
editor.applyList(listTitle, repliesPolicy);
new M3AlertDialogBuilder(getActivity())
.setTitle(R.string.sk_edit_list_title)
- .setIcon(R.drawable.ic_fluent_people_list_28_regular)
+ .setIcon(R.drawable.ic_fluent_people_28_regular)
.setView(editor)
.setPositiveButton(R.string.save, (d, which) -> {
- new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+ String newTitle = editor.getTitle().trim();
+ setTitle(newTitle);
+ new UpdateList(listID, newTitle, editor.getRepliesPolicy()).setCallback(new Callback<>() {
@Override
public void onSuccess(ListTimeline list) {
+ if (getActivity() == null) return;
setTitle(list.title);
listTitle = list.title;
repliesPolicy = list.repliesPolicy;
- args.putString("listTitle", listTitle);
- args.putInt("repliesPolicy", repliesPolicy.ordinal());
- setResult(true, args);
+ E.post(new ListUpdatedCreatedEvent(listID, listTitle, repliesPolicy));
}
@Override
public void onError(ErrorResponse error) {
+ setTitle(listTitle);
error.showToast(getContext());
}
}).exec(accountID);
@@ -89,24 +118,30 @@ public class ListTimelineFragment extends StatusListFragment {
.show();
} else if (item.getItemId() == R.id.delete) {
UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
- args.putBoolean("deleted", true);
- setResult(true, args);
+ E.post(new ListDeletedEvent(listID));
Nav.finish(this);
});
}
return true;
}
+ @Override
+ protected TimelineDefinition makeTimelineDefinition() {
+ return TimelineDefinition.ofList(listID, listTitle);
+ }
+
@Override
protected void doLoadData(int offset, int count) {
currentRequest=new GetListTimeline(listID, offset==0 ? null : getMaxID(), null, count, null)
.setCallback(new SimpleCallback<>(this) {
@Override
public void onSuccess(List result) {
+ if (getActivity() == null) return;
+ result=result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.HOME)).collect(Collectors.toList());
onDataLoaded(result, !result.isEmpty());
}
})
- .exec(accountID);
+ .exec(accountID);
}
@Override
@@ -117,14 +152,7 @@ public class ListTimelineFragment extends StatusListFragment {
}
@Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- fab=view.findViewById(R.id.fab);
- fab.setOnClickListener(this::onFabClick);
- fab.setOnLongClickListener(v -> UiUtils.pickAccountForCompose(getActivity(), accountID));
- }
-
- private void onFabClick(View v){
+ protected void onFabClick(View v){
Bundle args=new Bundle();
args.putString("account", accountID);
Nav.go(getActivity(), ComposeFragment.class, args);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 2a22ae0d1..2b7c6a874 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -12,12 +12,17 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
import org.joinmastodon.android.R;
import org.joinmastodon.android.api.MastodonAPIRequest;
import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
import org.joinmastodon.android.api.requests.lists.CreateList;
import org.joinmastodon.android.api.requests.lists.GetLists;
import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
+import org.joinmastodon.android.events.ListDeletedEvent;
+import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
import org.joinmastodon.android.model.ListTimeline;
import org.joinmastodon.android.ui.DividerItemDecoration;
import org.joinmastodon.android.ui.M3AlertDialogBuilder;
@@ -37,210 +42,218 @@ import me.grishka.appkit.utils.BindableViewHolder;
import me.grishka.appkit.views.UsableRecyclerView;
public class ListTimelinesFragment extends BaseRecyclerFragment implements ScrollableToTop {
- private static final int LIST_CHANGED_RESULT = 987;
+ private String accountId;
+ private String profileAccountId;
+ private final HashMap userInListBefore = new HashMap<>();
+ private final HashMap userInList = new HashMap<>();
+ private ListsAdapter adapter;
- private String accountId;
- private String profileAccountId;
- private String profileDisplayUsername;
- private HashMap userInListBefore = new HashMap<>();
- private HashMap userInList = new HashMap<>();
- private int inProgress = 0;
- private ListsAdapter adapter;
+ public ListTimelinesFragment() {
+ super(10);
+ }
- public ListTimelinesFragment() {
- super(10);
- }
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ Bundle args=getArguments();
+ accountId=args.getString("account");
+ setHasOptionsMenu(true);
+ E.register(this);
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- Bundle args=getArguments();
- accountId=args.getString("account");
- setHasOptionsMenu(true);
+ if(args.containsKey("profileAccount")){
+ profileAccountId=args.getString("profileAccount");
+ String profileDisplayUsername = args.getString("profileDisplayUsername");
+ setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
+ } else {
+ setTitle(R.string.sk_your_lists);
+ }
+ }
- if(args.containsKey("profileAccount")){
- profileAccountId=args.getString("profileAccount");
- profileDisplayUsername=args.getString("profileDisplayUsername");
- setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
- } else {
- setTitle(R.string.sk_your_lists);
- }
- }
+ @Override
+ protected void onShown(){
+ super.onShown();
+ if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
+ loadData();
+ }
- @Override
- protected void onShown(){
- super.onShown();
- if(!getArguments().getBoolean("noAutoLoad") && !loaded && !dataLoading)
- loadData();
- }
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
+ }
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
- }
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ inflater.inflate(R.menu.menu_list, menu);
+ }
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- inflater.inflate(R.menu.menu_list, menu);
- }
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() == R.id.create) {
+ ListTimelineEditor editor = new ListTimelineEditor(getContext());
+ new M3AlertDialogBuilder(getActivity())
+ .setTitle(R.string.sk_create_list_title)
+ .setIcon(R.drawable.ic_fluent_people_add_28_regular)
+ .setView(editor)
+ .setPositiveButton(R.string.sk_create, (d, which) ->
+ new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+ @Override
+ public void onSuccess(ListTimeline list) {
+ data.add(0, list);
+ adapter.notifyItemRangeInserted(0, 1);
+ E.post(new ListUpdatedCreatedEvent(list.id, list.title, list.repliesPolicy));
+ }
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == R.id.create) {
- ListTimelineEditor editor = new ListTimelineEditor(getContext());
- new M3AlertDialogBuilder(getActivity())
- .setTitle(R.string.sk_create_list_title)
- .setIcon(R.drawable.ic_fluent_people_add_28_regular)
- .setView(editor)
- .setPositiveButton(R.string.sk_create, (d, which) -> {
- new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
- @Override
- public void onSuccess(ListTimeline list) {
- saveListMembership(list.id, true);
- data.add(0, list);
- adapter.notifyItemRangeInserted(0, 1);
- }
+ @Override
+ public void onError(ErrorResponse error) {
+ error.showToast(getContext());
+ }
+ }).exec(accountId)
+ )
+ .setNegativeButton(R.string.cancel, (d, which) -> {})
+ .show();
+ }
+ return true;
+ }
- @Override
- public void onError(ErrorResponse error) {
- error.showToast(getContext());
- }
- }).exec(accountId);
- })
- .setNegativeButton(R.string.cancel, (d, which) -> {})
- .show();
- }
- return true;
- }
+ private void saveListMembership(String listId, boolean isMember) {
+ userInList.put(listId, isMember);
+ List accountIdList = Collections.singletonList(profileAccountId);
+ MastodonAPIRequest
+
+
@@ -129,4 +160,4 @@
-
\ No newline at end of file
+
diff --git a/mastodon/src/main/res/layout/display_item_video.xml b/mastodon/src/main/res/layout/display_item_video.xml
index 83e8112d9..1f1283fab 100644
--- a/mastodon/src/main/res/layout/display_item_video.xml
+++ b/mastodon/src/main/res/layout/display_item_video.xml
@@ -18,4 +18,6 @@
android:elevation="3dp"
android:background="@drawable/play_button"/>
+
+
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/edit_timeline.xml b/mastodon/src/main/res/layout/edit_timeline.xml
new file mode 100644
index 000000000..f2ee406b1
--- /dev/null
+++ b/mastodon/src/main/res/layout/edit_timeline.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 3253288b8..42c684975 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -87,7 +87,7 @@
+
+
+
+
+ android:background="?android:actionBarItemBackground"
+ android:contentDescription="@string/sk_compose_no_schedule" />
+
+ android:src="@drawable/ic_fluent_image_add_24_regular"/>
diff --git a/mastodon/src/main/res/layout/fragment_image_description.xml b/mastodon/src/main/res/layout/fragment_image_description.xml
index a1d2b0464..e8a4755b8 100644
--- a/mastodon/src/main/res/layout/fragment_image_description.xml
+++ b/mastodon/src/main/res/layout/fragment_image_description.xml
@@ -1,18 +1,19 @@
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+ android:layout_height="match_parent"
+ android:layout_marginBottom="250dp"
+ android:layout_gravity="top">
-
+
+
+
+
+ android:layout_height="0.5dp"
+ android:background="?attr/colorPollVoted"/>
+ android:hint="@string/alt_text_hint" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_activation.xml b/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
index b06b31155..b14f47e29 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
@@ -58,13 +58,14 @@
android:id="@+id/btn_resend"
android:layout_width="wrap_content"
android:layout_height="40dp"
+ android:layout_marginStart="36dp"
android:text="@string/resend"
android:paddingTop="0dp"
android:paddingBottom="0dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:fontFeatureSettings="'tnum'"
- style="@style/Widget.Mastodon.M3.Button.Text"/>
+ style="@style/Widget.Mastodon.M3.Button.Filled"/>
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_common.xml b/mastodon/src/main/res/layout/fragment_onboarding_common.xml
index d3e7ef23f..4cad26f59 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_common.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_common.xml
@@ -135,6 +135,16 @@
android:textColor="?colorM3OnSurfaceVariant"
android:text="@string/signup_random_server_explain"/>
+
+