Commit c6494d7e authored Mar 01, 2025 by Thomas

Fix issue #1130 - Use Pixelfed layout

parent e0b8b60f

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -3117,7 +3117,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
		} else {
		if (isVisible(timelineType, statusList.get(position), statusList)) {
		if (visiblePixelfed && isVisiblePixelfed(statusList.get(position)) && timelineType != Timeline.TimeLineEnum.UNKNOWN) {

		return STATUS_PIXELFED;
		} else if(timelineType == Timeline.TimeLineEnum.REMOTE && pinnedTimeline != null && pinnedTimeline.remoteInstance != null && pinnedTimeline.remoteInstance.type == RemoteInstance.InstanceType.PIXELFED){
		return STATUS_PIXELFED;
		}else {
		if(timelineType != Timeline.TimeLineEnum.UNKNOWN && getCurrentAccount(context).software != null && getCurrentAccount(context).software.trim().toLowerCase().equals("pixelfed")) {

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,8 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
		if (direction == null) {
		timelinesVM.getPixelfedDiscoverTrending(remoteInstance)
		.observe(getViewLifecycleOwner(), this::initializeStatusesCommonView);
		} else {
		binding.swipeContainer.setRefreshing(false);
		}
		}else { //Other remote timelines
		routeCommon(direction, fetchingMissing, fetchStatus);